Refactor gateway options to its own class.
Merge pull request #12 from gmacdougall/2-3-dev

Refactor gateway options to its own class.