Fixed two bugs
Merge branch 'independent_config' of https://github.com/florentpoujol/Daneel into independent_config