Various changes to make compilation less painful on linux
Merge pull request #21 from fgelm01/develop

Various changes to make compilation less painful on linux