Merge branch 'develop'
Version 0.6.1
Version 0.6.2-SNAPSHOT