Consolidate ifs in where()
Small changes that hopefully won't blow up LogicObject
Merge pull request #7 from timoschaefer/1.1

Merge branch '1.1'