Adding support for Mavericks