Defect Fixes
Merge pull request #133 from aptara/Gauri

Defect Fixes
Merge pull request #134 from aptara/Sprint-5

Sprint 5