Some more fixes
Merge pull request #244 from aptara/Sushil

Some more fixes
Merge pull request #245 from aptara/Sprint-5

Sprint 5