less confusing
Merge branch 'master' of https://github.com/jayggg/DPG
omit total field calculation