bug fixed
resolve merge conflicts
commit r2 before merging with master branch