Merge branch 'develop'
Version 0.6.4
Version 0.6.5-SNAPSHOT