Updated config
Merged with master and resolved config.php conflict