merge tow repo
 message
fixed a graphic problem