fix bug
merge master