First commit. Tested with jruby 1.7.11