20130408
vjde, not work
merge java