Added osx support same as linux