Updated for travis compilation in OSX