actually compiles
Merge pull request #1 from steakknife/master

Build fixed