Add support for non conventional controller returns
Merge pull request #7 from tonivdv/link_noconvention

Add support for non conventional controller returns