Merge pull request #11 from mstraka/master

Addes switch and serv hosts