Merge branch 'develop'
Version 0.1.6
Version 0.1.7-SNAPSHOT