Using isset instead of empty for checking conf
Merge remote-tracking branch 'origin/master'