Added config file saving for a couple of methods.
Merge remote-tracking branch 'origin/master'