Some fixes to allow to compile in GNU/Linux
Merge pull request #8 from Zardoz89/develop

Some fixes to allow to compile in GNU/Linux