Fixed so would work with Xcode
Merge remote-tracking branch 'origin/master'