Two bugs fixed: escape character and commands match