Changes to get to compile on Linux. So now it's been tested on Linux and Mac