Save settings working
Merge branch 'master' into Dylan