Fix for #352
Singular/Plural Strings Handled, Text Domain for i18n Strings
Merge pull request #381 from desaiuditd/issue-352

Fix for #352
Merge branch 'develop'