Merge pull request #129 from jwillemsen/jwi-cancelprevious