Merge branch 'develop' into 'master'

Merge develop into master

Closes #11 and #14

See merge request !17