Merge pull request #412 from sgimenez/db-transactions