Gemspec changes
Merge