Demo build fix.
Merge pull request #125 from ChrisGrant/master

Demo build fix.