Merge pull request #5 from TaichiN/gingerbread

Port roomservice from jb branch