room as context
Merge pull request #1 from itbeaver/feature/room_as_context

room as context