Merge pull request #1 from namvuonghcm/master

Kent changed
Merge remote-tracking branch 'upstream/master'
v10
fix conflict
Merge pull request #2 from DanteNguyen1008/master

fix conflict v10