Merge pull request #39 from bvcms/TransactionGateway

Merging transaction gateway to develop.
Quickfix for when there is no gateway.