Merge pull request #78 from toannguyenle/branch3

change something on the controller
styling