Fix #34
Updated version number and changelog.
Merge branch 'release/2.0.2' into develop