Fix and heap update
Merge branch 'master' of https://github.com/LenaVo/PSP