Revise prompt message for incorrect commands
Merge branch 'master' into linux