Update gems

Close #408, close #407
Merge pull request #413 from Helabs/tb/update-gems

Update gems