fix for rubinius
Merge branch 'work'