Gateways RB re-factoring WIP
Merge pull request #20 from antonkorotkov/development

Gateways RB re-factoring WIP