Fix merge issue
Merge pull request #147 from aptara/Sushil

Fix merge issue