Merge 1
Merge 2
Merge branch 'master' of github.com:cawoodm/crafty-memory