Merge branch 'develop' into 'master'

Fix #23

Closes #22 and #23

See merge request !15
2 jobs for master in 2 minutes and 2 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #30175
docker
test

00:01:42

 
  Deploy
passed #30176
docker
deploy

00:00:20