Merge pull request #22 from slandelle/master

Ugly boolean computations