Issue #33 - along with change added new config option for other connection based properties