Updated command base
Merge origin/master