Merge pull request #285 from blkperl/fix_metadata