Monitoronly

Merging monitor only branch into the master branch.