Merged fix/wrongport into master
bump version to 1.0.1
Merge branch 'release/1.0.1'