com3 done
Merge branch 'master' of https://github.com/diemkhuu/BigW-Emerso
optimize