Integrate BertramScharpf ruby 2 compatibility

Thanks Bertram Scharpf for the fixes :)