changes from old version
merged with master
git add config.php index.php