Update composer
Merge origin/master
Refactor controller