Merge branch 'develop'
Merge branch 'develop', release 0.1.5
release 0.1.5
Merge branch 'master' into develop