Commits to fix issues caused by update to Xcode 4.6
Merge pull request #1 from edward-gvc/master

Commits to fix issues caused by update to Xcode 4.6