Formatters, validators
Merge branch 'master' of git.kuckian.co.uk:err-wheatley