Merge pull request #1905 from waldyrious/patch-4

Add confguration->configuration