Merge branch 'release/0.2' into develop
Missing imports added
Prep for release
Merge branch 'release/0.2.1'