Proper Message parsing
Merge origin/master