Added more logging and did a small config change.
Merge remote-tracking branch 'origin/master'