Rooms 202

Pull request for issue ROOMS-202