Merge pull request #10 from cndreisbach/master

Fix failing tests