* Temporary fix to troubleshoot Save() if this helps fix some desync and save issues then Save() may need to be redone.
Merge pull request #156 from stheno/master

* Temporary fix to troubleshoot Save() if this helps fix some desync and...
Merge pull request #3 from cavedude00/master

merge