Cleaner configuration file loading code
Merge pull request #4 from durio/master

Cleaner configuration file loading code