Merge pull request #96 from charsleysa/metadata

Worked on general issues and bugs