Merge pull request #1 from RabbitExpress/master

Rebased against origin
Merge pull request #3 from kbreidenbach/master

Merge pull request #1 from RabbitExpress/master