redevelop transaction handling
Merge pull request #209 from Alex-Diez/ALFA_0_1

redevelop transaction handling