finalised changes with transactions
Merge branch 'master' of https://github.com/ruddernz/Snapper