optional modifiers
Merge pull request #14 from otaviosoares/feature/optionalmodifier

Feature optional modifiers and ordering