Merge pull request #253 from aptara/rajib

Rajib
Fixed the merge issue