fixed bug
merge github