-- CRM-9202 applied patch and made some fixes
Merge pull request #25 from ravishnair/CRM-9202

-- CRM-9202 applied patch and made some fixes