Merge pull request #160 from wagnert/master

Changes for new MQ version