Update master code
Merge pull request #2 from sontayninh/master

Test
Merge pull request #1 from sontayninh/tri-branch

Update master code