Improved Yo wrapper and better tests
Merge branch 'release/0.2.0'