Latest Controller Code
Merge pull request #9 from wegrata/master

Fixed controller