payment uses parameters now (not tested)
payment uses parameters now (tested and debugged)
Merge remote-tracking branch 'origin/master' into payParameters