Fix for issue #8
Fix for issue #9
Updated version number and changelog.
Merge branch 'release/2.0.1'