refactor CommandHelper
Merge origin/master