Removed dependency on experimental 'when'.
Merge pull request #2 from zaucker/master

Removed dependency on experimental 'when'.