Revise command to check command exists
Merge branch 'master' into mac