Changes for Xcode 5.1
Merge pull request #12 from thekarladam/master

Changes for Xcode 5.1