Logical operator fixes
Merge pull request #350 from GrahamCampbell/logical-operator-fixes

Logical Operator Fixes