Merge pull request #5 from vmoravec/master

Fix failing testsuite
Fix failing testsuite