Fixed bug 101

Addressed bug # 101
Merge branch 'hotfix-1.0.1' into develop