fixed merge, adding mutlicast note