fix bug of massage
Merge branch 'issue-35' into develop