moved the reading and storing of the config values to a seperate class
Merge remote-tracking branch 'origin/master'