Merge pull request #23 from lwade/master

s/with/when for conditionals
Fixes.