ECDR-56: Updated metadata setting logic.
Also fixed some grammer and spelling errors.
Merge pull request #16 from mrmateo/ecdr56

ECDR-56: Updated metadata setting logic.