Merge pull request #6 from elemento15/development

Generic controller