Merge
Better version number in gem.
Gemspec fixs.
Fix gemspec removed unused file.
Doc change.
Fixes and doc changes.
Merge remote-tracking branch 'upstream/master'