Merge branch 'develop'
Bump to version 0.6
Change to version 0.6-dev