Merge pull request #70 from hiroyoshi/master

improve keeper
improve keeper