More compilation stuff
Merge pull request #20 from darkshark007/master

More compilation stuff