Merge pull request #195 from hunner/fix_metadata