added config load and save
Merge remote-tracking branch 'rud/master'