Merge pull request #152 from SenseiKiwi/master

Improvements to Saving
Merge pull request #153 from SenseiKiwi/master

Updated Version
Merge remote-tracking branch 'upstream/master'