Fixed bug in schema file.
Merge branch 'test' into dev