refactored configuration file handling, closes #265
Merge branch 'issue265' into devel