Merge branch 'release/0.2.0'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
rename things a little.