Clien changes
Merge remote-tracking branch 'origin/master'
Configuration reading implemented
Tests to be done