Merge pull request #9 from cocos2d/develop

pull down