fixed bugs
merge branches