Fixed many Controller errors
Merge pull request #10 from ktn/Neocontroller

Fixed many Controller errors