Check for language in metadata field, and add properly, fixes #4