Merged dev with master and bumped to v1.0.1
Merge branch 'dev'