edit on eclipse
merged OK