fix bug3
add feature4
merge
add feature3
megrin feature4