Updated the readme and example configuration file.
Merge remote-tracking branch 'origin/master'