Refactor of proxy storage.
Avoids generated lots of temporary files unnecessarily.
Merge pull request #7 from JonathanO/master

Refactor of proxy storage.