command key support
catch an errors
Merge remote-tracking branch 'origin/master'