Merge pull request #19 from ChristianMurphy/develop

sprint 1
Merge branch 'master' of https://github.com/jed833/gateway into develop
Fixed #27 and #37.