Tweaked a bit.
Merge branch 'peter'