Added two extra config properties
Merge remote-tracking branch 'origin/master'