Merged latest version from cocos2d