Merge branch 'master' into develop
fixes #29
fixes #30
Version bump to 0.1.16
build v0.1.16
Merge branch 'release-0.1.16'