Some changes necessary to build in Xcode6-beta6.
Merge pull request #21 from MecoKing/xcode6-fixes

Some changes necessary to build in Xcode6-beta6.