Merge branch 'persistent' into stash-client
Merge pull request #7 from wayofthepie/stash-client

Merge branch 'persistent' into stash-client