added checks for existance of correct configuration
added new config parameters
Merge remote-tracking branch 'origin/master'