Refactor and add some commands.
Merge remote-tracking branch 'origin/master'