Nasty fix for OR operator being applied instead of AND
Merge pull request #37 from grownseed/master

Nasty fix for OR operator being applied instead of AND