bumped version to 1.0.1
fixed bug in feature 3
Merge branch 'hotfix-1.0.1'