Tests passed
Merge pull request #48 from buldezir/master

metadata refactor
Merge branch 'meta'