Merge pull request #25 from xoppa/master

Cleanup a bit
Fix includes