Use logical operators to shorten implementation
Merge pull request #1 from aadmathijssen/patch-1

Use logical operators to shorten implementation