Changed program to reflect the actual prompt.
Merged from origin.
Merged from stash.