Fixed the merge issue
Merge pull request #255 from aptara/rajib

Fixed the merge issue