Modified WAITUNTIL

Might be a fix to the starting/stopping problem, remains to be seen.
Read this for more details:

http://stackoverflow.com/questions/1024651/do-i-have-to-worry-about-interruptedexceptions-if-i-dont-interrupt-anything-mys/1024719#1024719