Added support for mac os x