Merge pull request #5 from wayofthepie/stash-client

Stash client
Merge pull request #6 from wayofthepie/persistent

Persistent
Merge pull request #7 from wayofthepie/stash-client

Merge branch 'persistent' into stash-client