Merge pull request #54 from dannybutler/master

Adding metadata filtering