--fixed for CRM-12148 and fixed formatting
Merge pull request #187 from pradpnayak/CRM-12148

--fixed for CRM-12148 and fixed formatting