Merge branch 'dev'
Release 0.2.0
Merge branch 'master' into dev