Fixing build regression for issue #30
Merge pull request #31 from johnburbridge/issue-30-build-regression

Fixing build regression for issue #30