Fixed defects
Merge pull request #172 from aptara/Sushil

Fixed defects
Merge pull request #173 from aptara/Sprint-5

Sprint 5