Added timeout to thread join for easier abort with CTRL-C