Merge branch 'issue63' into 'develop'

Fixes for addressing transactions' issues

See merge request !57