Merge pull request #249 from spumko/when

Alternatives bug fixes
Change validate API. Closes #250