worked on CRM-12011
Merge pull request #36 from kurund/CRM-12011

worked on CRM-12011