Change to script from jhlj: makes config parameter optional.
Merge remote-tracking branch 'origin/master'