Bug fixes and passing tests
Release 0.1.1