merging master gemspec