Fix for issue #36 and #37
Fix for issues #35 and #36
Updated version number and changelog.
Merge branch 'release/2.0.3' into develop