Make it a bit more interruptable
Merge pull request #3 from vmx/more-interruptable

Make it a bit more interruptable