Merge pull request #24 from fehguy/master

added model schema, test cases