Added more Mac compatibility
Merged