second version of robs additions
Merge branch 'master' of github.com:padal/report