Updated for Terminal v2.4 (Mavericks)