Merge branch 'master' into develop
Version bump to 0.7.1
fixes #15
Merge branch 'release-0.7.1'