Merge pull request #1 from MaddTheSane/master

Fix compilation on Xcode 6 beta 6.