add tests, smarter cleanup
Release 0.0.2