configuration file read/write straightened out a little better
Merge remote-tracking branch 'origin/master'