Develop 2.0 branch fix for issues #230 and #264

This includes the fixes for 2 issues on the develop-2.0 branch.
Issue #230 (support JSON schema required property)
Issue #264 (consecutive model types not being expanded)