Merge pull request #9 from cew821/schema_update

Schema updates