Merge with "7 chatroom switch"

Fixes #7