Renamed configuration
Merge pull request #26 from damienlevin/master

Renamed configuration.