ifelse was broken
Merge pull request #150 from romainfrancois/master

ifelse was broken -- thank you!