fixes payment problem
Merge branch 'master' into pearly-tea