changes done to cometservice message calculator
conflict resolved with issue-52 and merged with develop