Merge pull request #1 from dungmickey/master

update, nhoa Nha