fixes compilation errors
Merge pull request #1 from ohenley/master

Fix compilation errors.