Modified save behavior and providers
Merge pull request #126 from BlackVoid/master

Modified save behavior and providers