Fixed few compilation errors.
Merge branch 'master' of http://github.com/dowel/hless