updates for osx & linux support