Fixing build in Xcode 6
Merge pull request #151 from thusfresh/Xcode6Fix

Fixing build in Xcode 6