Get things to compile
Merge pull request #1 from steshaw/master

Get things to compile