Merge pull request #14 from yashodha/CRM-12864

Crm 12864
more fixes