Merge pull request #1763 from anandpdoshi/hotfix

Fixed address template and changed case