changes to work with ruby 1.9 and 2.0