Adjustment for handling of transactions
Merge pull request #346 from dshurt/master

Adjustment for handling of transactions