compiles under Xcode 6 now
Merge pull request #46 from detouch/master

compiles under Xcode 6