added server var filling and some other stuff
Merge pull request #7 from zelgerj/master

added server var filling and some other stuff