Fix unit tests (issue #65)
Merge pull request #66 from andypelzer/master

Fix unit tests (issue #65)