server-config
Merge remote-tracking branch 'origin/master'
Merge pull request #47 from dpolivaev/master

server config