Prepared for working on MacOSX