Release 1 compliant
Refer to correct branch
Merge pull request #4 from bartscheers/query_monitor

Query monitor