make build pass on Xcode 6.1.1
Merge pull request #4 from tualatrix/master

make build pass on Xcode 6.1.1