Oops, left in a short-circuit from debugging
Merge pull request #56 from HairyFotr/patch-4

Oops, left in a short-circuit from debugging