REFACTOR: issue #26

The config parse code is now much easier and less long.
Merge branch 'development' into issue#26
Merge branch 'issue#26' into development