Closes #14 Fixing metadata collection
Merge pull request #15 from erikvold/14

Closes #14 Fixing metadata collection