Final checkin
Merge pull request #293 from aptara/Sushil

Final checkin