Merge pull request #191 from jerv13/master

Basic save implemented