Merge branch 'master' into load_balancer
implemented load balancer
Merge master back to load_balancer, to enable pull request.