Merge pull request #4 from cocos2d/develop

Merge from trunk