Merge pull request #8 from akutz/feature/persisted-metadata

Support persisted metadata