Memory check
Changes:
- Correction of all memory potentials problems
Merge branch 'master' into memory
Commit to finalize merge