Fixed error, bumped version
Merge branch 'hotfix-0.2'