Fxied compilation issues
Merge pull request #2 from farcaller/master

Fixed compilation issues