Fix to use master and add config.xml