Merge branch 'dev'
Release 0.1.8
Bump to 0.2.0-SNAPSHOT