Updated reporting, attempt 2
Merge pull request #11 from bmwsedee/master

Updated reporting, attempt 2