Merge branch 'schemacheck'

Fixes #14