Update gems

Close #408, close #407