Merge pull request #37 from davidbgk/master

Consistency across active statuses in transactions