Fixing build.
Merge pull request #154 from ChrisGrant/master

Fixing build.