Merge pull request #1 from hongoctrien/develop

Update master
Merge pull request #2 from hongoctrien/master

Merge pull request #1 from hongoctrien/develop