Merge branch 'hotfix/1.0.1'
Config file
Conflicts in conf.php resolve
Readime file update
Readme file update