Fixing project
Merge pull request #136 from jocelynlih/xcode-6.1-fixes

Fixing project