Merge pull request #112 from CKHuang/master

room edit
update
Merge pull request #98 from jun-lu/master

get update