support for config file was added
Merge remote-tracking branch 'origin/Config-file-support' into Config-file-support