Merge pull request #100 from bstell/master

Now persisting data.
Merge remote-tracking branch 'upstream/master'