Fixes #33
Fixes #32
Fixes #29
fixing unit tests on travis
Fixes #34