Fixes compatibility for < Ruby 2 - Related to #75
Merge remote-tracking branch 'upstream/master'