changes for bugs
Merge pull request #75 from deepak496/bugs_branch_1oct2014

changes for bugs