fixed some issues
Merge pull request #221 from ritesharora89/mybranch

fixed some issues