Merge branch 'develop'
Nump to version 0.6.0.
Merge branch 'develop'
Bump to v0.6.1
Merge branch 'master' into develop