Initial Work
Fix connection limit to include buffer

Fix connection limit to include buffer for more than 10 servers
Fix homepage info
Merge remote-tracking branch 'origin/master'