Merge pull request #27 from fehguy/master

updated schemas, tests to cover most all examples