Metadata config update
Merge pull request #2 from simondavies/master

Merging Develop to Master
Merge pull request #3 from simondavies/develop

Develop merge to master