minor changes
merged
Merge branch 'master' of github.com:sshamilton/multicast1