Merge pull request #525 from gsn/test

Merged from test.
294 - initial folder set up

cash saver, tx
Merge pull request #528 from gsn/master

Merged from beta.