MetadataView update
Merge pull request #66 from azaroth42/master

MetadataView update