Build fixes for linux
Merge pull request #1 from metajack/build-linux

Build fixes for linux