Merge branch 'develop'
Version 0.6.0
Version 0.6.1-SNAPSHOT