cometservice mqueries
Merging issue-38 into develop and resolved conflicts