Fix Xcode 6.1 ** BUILD FAILED **
Merge pull request #39 from yeahdongcn/master

Fix Xcode 6.1 ** BUILD FAILED **
Merge pull request #4 from trawor/master

同步到最新