Merge branch 'develop'
Version 0.6.2
Version 0.6.3-SNAPSHOT