Merged pull requests:

• Fix leaking transaction, favor transaction from context over creating new one #29 (dawaa)