Change PS1 to PROMPT
Merge remote-tracking branch 'origin/master'