Don't use logical operators in ifs
Merge pull request #181 from GrahamCampbell/logical

Don't use logical operators in ifs