added a few more config options
Merge remote-tracking branch 'origin/master'