fixed #146
Warking on #149
Merge branch 'hotfix/paymentupdate'