Merge pull request #373 from mhaskel/metadata