Workaround for InterruptedExceptions
spaces in the diff. exterminate.
Merge pull request #315 from riking/patch-1

Workaround for interruptions