Updates to reflect the last refactoring of the Memory extension
Merge pull request #298 from timwindsor/master

Updates to reflect the last refactoring of the Memory extension