Merge branch '28thmayissue' into recursive_payment
changes on pricing
Merge branch 'recursive_payment'
changes on pricing and issues stated