Remove support for ruby 1.8.7
pull request improvements and minor refactoring