Merge pull request #18 from thewillhuang/hiroshi

Replace id with jwt.