fxied issues
Merge pull request #207 from ritesharora89/mybranch

fxied issues