Changed save and load implementation
Merge pull request #161 from cchan5/master

Changed save and load implementation