Ruby 2.1.2 upgrade

Upgraded 4 files for Ruby 2.1.2 upgrade - used "2.1.2" branch.