Added support for Mavericks