Fixed the message association
Merge pull request #18 from ShirajG/master

Fixed the message association