enhanced modularity of monitors
bug fix + enhanced modularity of reporting
Merge branch 'master' into dev