fixed file not found exception in configuration handling
Merge remote-tracking branch 'origin/master'