complete rewrite
Release 0.1.0