Fixes for Xcode 6 beta 7
Merge pull request #15 from FahimF/xcode6beta7

Fixes for Xcode 6 beta 7