Some Comments For the controller class!
Merge origin/master