Tidy up project and bug fixes
Release v0.0.2