Resolves #20. Fixed failing unit test.