Merge pull request #10 from inspiran/master

Made gateway compliant with it's interface