Merge branch 'develop'
Bumps to version 0.2.0
Merge branch 'master' into develop