Fixed build and tests
Merge pull request #331 from jamesrhurst/fix

Fixed build and tests