Version bumped from  0.2.0 to 0.2.1
Merge branch 'hotfix-0.2.1'