refactor, better tests
Release 0.1.0