memory maagment optimised
Merge branch 'master' of https://github.com/payyng/Payy