Resolve the merge conflicts
Merge pull request #230 from aptara/Sushil

Resolve the merge conflicts
Merge pull request #231 from aptara/Sprint-5

Sprint 5