Update from upstream and update gemspec