Fixing documentation
Change configuration
Merge pull request #46 from rdegges/develop-paul

Fixing documentation