Added OSX-support