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

msg refactor
Merge pull request #36 from ffmegaman/emmanuelbranch

Emmanuelbranch
upon-completion
Merge branch 'master' into completion