Closes issue #1002, and adds additional payment transaction support.