Merge pull request #84 from mavenraven/master

Adds better support for validation of optional fields.