Merge branch 'develop'
Bumped version to 0.1.2-SNAPSHOT