#619 merged general updates
#619 fixed issue relating to duplicate dispatch message.