Merge branch 'release-0.2'
Merge branch 'develop'
Merge branch 'release-0.3.0'
Fixed a Readme typo and cleared up some language
Merge branch 'master' into develop