Refactoring Message
Message refactoring
Refactoring Message Class
Merge branch 'master' into collections