fix controller
Merge pull request #23 from mplaza/melabranch

fix controller