Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller