ok
Semi complete some code
Merge branch 'master' into thinhnv