Update from justjavac's repo