Changes to get code wordking with ruby 1.8.7