Merge branch 'release/2.0.0' into develop
Fix for #32
prep for 2.0.1
Merge branch 'release/2.0.1'