Merge pull request #11 from stoewer/metadata

100%

Who is afraid of the man in coveralls?! ;-)