[wip] compilation fixes
Merge pull request #2 from ozamorowski/master

[wip] compilation fixes