NEW ROOM INFO ADDED
Merge origin/master