Merge pull request #1 from hpnguyen/master

update from server 172.28.40.248
Merge pull request #2 from hpnguyen/release1

Merge pull request #1 from hpnguyen/master