Make it build.
Merge pull request #1 from duncanwilcox/master

Make it build.