Merge pull request #58 from orta/master

@ashfurrow => xcode 6.1 support