Revised and re-structured
Merge branch 'master' of git://github.com/ericjeney/btunderreporting