CRM-12836 : applied patch, working fine
Merge pull request #37 from pratik-joshi/CRM-12836

CRM-12836 : applied patch, working fine