Merge branch 'release/2.6.0'
Pump version to 2.6.1 which fixes #22
Merge branch 'release/2.6.1'
FIX #157
merge from origin gemspec