Merge pull request #9 from GrangerHub/linux-fixes

Merge pull request #9 from GrangerHub/linux-fixes

Apply some fixes for the Linux build.

MERGE COMMIT

GitHub
sha: 9cb62aaa