Merge pull request #122 from CKHuang/master

get update
update ROOM
Merge pull request #109 from jun-lu/master

get update