Make it build
Merge pull request #154 from davibe/master

Make it build