Merge to the lastest

Please review it. Thanks