[WIP] Improve gemspec and Gemfile