Merge pull request #253 from apenney/add-metadata