Merge pull request #1 from phamvanhung2e123/develop

test
fix
fix2
Merge pull request #2 from phamvanhung2e123/new

New
develop fix merge