delete when
Merge pull request #5 from ShaneLau/master

delete when