Merge pull request #123 from wardi/master

Metadata Schema: Let's Break Everything