Minor changes to message associations
Merge pull request #13 from jcsalaza/master

Minor changes to message associations