Merge branch 'develop' into 'master'

Develop

Closes #24 and #22

See merge request !16
2 jobs for master in 29 minutes and 41 seconds
Status Job ID Name Coverage
  Test
passed #33044
docker
test

00:15:47

 
  Deploy
passed #33045
docker
deploy

00:13:54