Added comments to Rooms
Merge origin/master