Added code to support 4 servers
Merge branch 'sweta'