Update gems, and update code as needed
Merge pull request #1 from hfwang/master

Update gems, and update code as needed