Fixes for Xcode 6 Beta 6.
Merge pull request #2 from raylai/master

Fixes for Xcode 6 Beta 6.