More logical and natural names and mechanisms in configuration...

More logical and natural names and mechanisms in configuration...
Merge pull request #14 from Amalric/master

More logical and natural names and mechanisms in configuration...