Fix for cancellation
Merge branch 'master' of git://github.com/jeperkins4/sabre