tidying up, part one
Merge branch 'master' of github.com:cheidegg/MPAF