Don't really know what I changed...
Merge pull request #35 from cremalab/t-message-30-MAO

Merg222