added fully tested OSX support