more work
bumped version
Merge branch 'release/0.2.0'