Merge pull request #1 from dcshock/develop

Develop
Merge branch 'master' into feature/consumers