Fix compilation issues
Merge pull request #1 from abstractj/working

Fix compilation issues