Cleanup for 0.2 release
Cleanup for release 0.2