Upgrade when
Merge pull request #93 from muffinresearch/upgrade-when

Upgrade when