metadata refactor
Merge pull request #48 from buldezir/master

metadata refactor