Merge pull request #228 from aptara/Sushil

Sushil
Resolve the merge conflicts