Added threading (get's stuck after a while)

and that's not nice :P