fix cached
fix code
fix some code
Merge pull request #6 from pbin/master

update