Merge pull request #1 from hongoctrien/develop

Update master