Merge pull request #1 from nhutnguyen/new1

merge