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

fixed some issues