resolved bug
resolved bug
resolved conflicts
Merge pull request #135 from priyanka-techmaes/resolved-bugs

Resolved bugs