Merge pull request #23 from jacobrosenthal/master

Tested on Mavericks and upgraded for Xcode 5.0.1. Closes #7, attempted 'fix' for #24