Merge pull request #10 from aptara/Gauri

Defect Fix
Merge pull request #13 from aptara/Sprint-3-

Merge pull request #10 from aptara/Gauri