Merge pull request #18 from eike-welk/master

Functionality for alternative configuration files
Added contributors
Fixed formatting