pay_u improvements
Merge branch 'pay_u'