Merge pull request #1 from shavit/pubsub

typo in layout
Merge pull request #2 from shavit/pubsub

Pubsub
comment