adding a bug fix description
Merge branches 'master' and 'my_testing'