Linux compile fixes.
Merge pull request #12 from bitshifter/master

Linux compile fixes