Final checkin
Merge pull request #293 from aptara/Sushil

Final checkin
Merge pull request #294 from aptara/Phase2_Sprint1

Phase2 sprint1