Fix failing testsuite
Merge pull request #16 from vmoravec/master

Fix failing testsuite