minhnc change

asd
Merge branch 'master' into MinhNC
ok conflict

asd