Fixing cards 118 and 131
Fixing code conflicts
Merge pull request #884 from ORCID/Fix118And131

Fixing cards 118 and 131