Merge branch 'develop'
Version 0.1.7
Version 0.1.8-SNAPSHOT