bundle install and gemspec fix
merge