Modify controller
Merge pull request #2 from nguyentrongtam/develop

Modify controller