modify Message constructor
Merge branch 'developer'