Merge pull request #1 from RabbitExpress/master

Rebased against origin