Edit PS1 format
Merge branch 'master' into work-separate-boxen