Improved PS1 code.
Merge branch 'master' into mac