EnumSet instead of multiple checks
Merge pull request #342 from rostafiychuk/enumset

EnumSet instead of multiple checks