adding persistent state
Merge branch 'master' into move
Merge pull request #5 from SirHound/move

Move