support for xcode6
Merge pull request #20 from adam-allidina/master

Support for XCode 6