Fixed #2
Bumped version
Merge branch 'release/0.8.1'