improve controller
Merge pull request #17 from AlexKtf/clear-controller

improve controller