last minute changes
Merge branch 'amqp'