Merge pull request #90 from joemarini/master

Use new metadata method