Merge pull request #1 from phamvanhung2e123/new

New
fix
Merge pull request #2 from phamvanhung2e123/newnew

fix
fix
fix