Small improvements to CPController
Merge pull request #254 from VladimirTechMan/small_improvements_to_cpcontroller

Small improvements to CPController