Merged changes from 0.7.2 bankwire