Save and Reset functionality
Merge remote-tracking branch 'origin/master' into Max