Merge branch 'develop'
Start development towards v0.6.