Controller: detect data as the first param even with a nonsense second param
Merge pull request #47 from mikesherov/stuff

Controller: detect data as the first param even with a nonsense second param