msg refactor
Merge pull request #35 from ffmegaman/Msg-Refactor

msg refactor