Simplify boolean expression
Merge pull request #29 from naoliv/pull17

Simplify boolean expression