cafe fixed to update properly. xmtues added.
Merge pull request #37 from chuanshi/xmute-to-upstream

cafe fixed to update properly. xmtues added.