Updated for Xcode 4.6
Removed unnecessary prefix header
Merged