Fix compilation issues.
Merge pull request #8 from cunningt/fixcompile

Fixcompile