fix issues with Xcode 6.1
Merge pull request #1 from gdavis/master

Fix issues with Xcode 6.1