Refactoring controller builder
Merge pull request #1 from miquelbarba/refactor_controller_builder

Refactoring controller builder