Merge branch 'develop' into 'master'

New version

Closes #16, #20, and #18

See merge request !11
1 job for master in 44 seconds (queued for 3 seconds)