Updated for Mavericks (Mac OS  10.9)