Gateways re-factoring
Merge pull request #25 from antonkorotkov/development

Gateways re-factoring