more changes
changes to object structure for new message format
Merge remote-tracking branch 'origin/master'