improve keeper
Merge pull request #71 from hiroyoshi/master

improve keeper