Merge branch 'release/1.0.1' into develop
fix issue #4 and add regression tests for it
bump version
Merge branch 'release/1.0.2' into 1.0_master