Better formatting
Merge branch 'master' of github.com:petergp/02232