Fixing validation errors on cze's working branch.
Fixing validation errors on cze's working branch.
Merge pull request #524 from dwcramer/FixConstanzeworking22

Fix constanzeworking22