Merge branch 'release/0.1.5' into develop
author smaller
even smaller
Merge branch 'develop'