sync
Merge remote-tracking branch 'upstream/test' into test
new messages
Merge pull request #21 from gogolander/test

minor changes