Configuration Class with JDOM
Merge origin/Sebastian into Sebastian