Resolved bugs
Merge pull request #165 from priyanka-techmaes/bugs

Resolved bugs