Merge pull request #484 from roji/transactions_pspe