Merge pull request #31 from bwo/fix-lru-remove

Fix lru remove
WIP eat all the delicious ICE
bury the ICE
Merge pull request #36 from Gankro/refreshment

WIP eat all the delicious ICE
Merge branch 'master', remote-tracking branch 'upstream/master' into fix-lru-remove