Merge pull request #133 from pflooky/strict-schema