Adjusted gemspec and version
Merge conflict resolved