Merge pull request #3 from akm/develop

for JRuby-1.7.x