Make it compile
Merge pull request #90 from erwinwinder/master

Make it compile