Merge pull request #171 from pedroigor/master

Some changes to support the complex schema tests.