Fix failing tests
Merge pull request #20 from vmoravec/master

Fix failing tests