Merge branch 'release/0.2.1'
Merge branch 'master' into develop