Merge pull request #43 from janm399/master

Better RabbitMQ codebase.