Merge pull request #4 from philippec/master

Updated for Xcode 5