Merge pull request #217 from TheBlueMatt/2018-10-msg-resp-overhaul