introduced config
Merge branch 'master' into pavel/development