Ruby 2.1.5

Fixes #163
Merge pull request #223 from ntwb/patch-13

Ruby 2.1.5