Merge branch 'develop'
Backmerged release 0.1.0 into develop