Merge pull request #94 from icattlecoder/feature/persistent

add persistent
fix
Fix