Defect fixes
Merge pull request #210 from aptara/Sushil

Defect fixes
Merge pull request #211 from aptara/Sprint-5

Sprint 5