Fix bug in case configuration is split into multiple files. Fix bug in
case the configuration function is executed manually. Added more
in-line documentation.
Update documentation