Merge branch 'pr/78'

Change-Id: If097fbcd797a62ae4afd4418b2871e161befddfb

Author: skriptble

core/topology/server.go

@@ -251,6 +251,8 @@ func (s *Server) update() {
 	defer s.closewg.Done()
 	heartbeatTicker := time.NewTicker(s.cfg.heartbeatInterval)
 	rateLimiter := time.NewTicker(minHeartbeatInterval)
+	defer heartbeatTicker.Stop()
+	defer rateLimiter.Stop()
 	checkNow := s.checkNow
 	done := s.done