Merge pull request #227 from gavincornwell/master

Fixed failing tests.