Added description to the config dir parameter
Merge remote-tracking branch 'origin/master'