Merge pull request #4 from mainini/issue-3

Closes issue 3, deferring addition of metatype.xml
Merge branch 'master' into issue-5