Modified controller implementation
Merge branch 'master' of https://github.com/JesusGavilan/project-graph-db-draft