bug fixed release1
merge solved