Merge pull request #40 from kynm/refactor_code

fix controller
Merge pull request #44 from VuThiMinhHang/fix_code

Merge pull request #40 from kynm/refactor_code