Merge branch 'release-0.2' into develop
Changed the version number
Merge branch 'master' into develop
Bumped the version number
Removed the .pypirc file
Updated the version number in the documentation