Merge pull request #83 from charsleysa/metadata

Metadata - Initial Iteration (closes #59)