Merge pull request #506 from chjj/paypro

Payment Protocol: Improvements.
Merge branch 'master' of https://github.com/kefkius/mazacore