Fixed failing tests
Merge pull request #105 from colinbull/master

Fixed failing tests from #104