Added --non-blocking (-b)