- fixed commands
Merge origin/master