more mods to make it compatible with ruby 1.8.7. Mark