Update gemfile and gem dependencies

Fix #121 and #125