Fixed the defects
Merge pull request #246 from aptara/Sushil

Fixed the defects
Merge pull request #247 from aptara/Sprint-5

Sprint 5