fix room
Merge develop into master