[UPDATE] refactoring
Merge branch 'master' of https://github.com/YannickL/CCControlExtension