Merge pull request #1 from dungmickey/master

update, nhoa Nha
Merge pull request #2 from nhaho/master

Merge pull request #1 from dungmickey/master