master branch merged in paypal stuff