PayPal : Merged PR #333