Merge branch 'release-0.2' into develop
Corrected the version number in the setup file.
Merge branch 'release-0.2.1'