Defect fixes
Merge pull request #210 from aptara/Sushil

Defect fixes