-- worked on CRM-12957
Merge pull request #25 from ravishnair/CRM-12957

-- worked on CRM-12957