Fixes
Merge pull request #203 from aptara/Sushil

Fixes
Merge pull request #204 from aptara/Sprint-5

Sprint 5