updated master branch, and paypal branch