Changes from mail

Proposed changes received on mail from ePay