Merge pull request #2 from mrkhoa99/developer

[1] viet
Merge branch 'developer'
Merge branch 'developer'
Merge branch 'master' into developer