Merge pull request #1 from winki/transaction_objects

Merge branch "Transaction objects" into master