Merge branch 'develop'
Backmerged release 0.1.1 into develop