Refactor of Controller code
Refactor of Controller code
Merge origin/master