+ fixed test failures
Merge pull request #35 from inexplicable/master

+ fixed test failures