Updated to make the project more JRuby friendly.