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

Fix merge issue
Merge pull request #148 from aptara/Sprint-5

Sprint 5