Merge pull request #36 from pretenders/story/27/alex

Story/27/alex
Merge branch 'develop' of git+ssh://github.com/pretenders/deploystream into story/28/alex