Fix all platform compilation!
Merge pull request #417 from Kenny9999/development

Fix all platform compilation!