branch test
bug 976 fixed
merge bug fix 976