RE factoring the code
Merge pull request #8 from aptara/Sushil

Sushil
Merge pull request #9 from aptara/Sprint-3-

Sprint 3