refactored, updated ghpage, tests working
Release 0.2.0