minor bug fix
merge branches