Closes GH-12
Merge pull request #13 from suciuvlad/master

Fixes failing tests. closes #12