Fixed bug in controller
Merge branch 'calculator'