Merge pull request #1 from sontayninh/tri-branch

Update master code
Merge pull request #3 from sontayninh/tri-branch

Tri branch
Merge branch 'origin/master'