Add support for completing payments
Merge branch 'hotfix/0.1.8'