Made it work with Linux and MAC OSX