changes for bugs
Merge pull request #117 from deepak496/bugs_11dec_branch2

changes for bugs