Changes to make it compilable-ish
Merge branch 'master' of https://github.com/la1k/cwhorse