Updated for Mac OS - Lion