[BUGFIX] Allow custom controllers
Merge pull request #113 from hmspl/development

[BUGFIX] Allow custom controllers