Added --failfast option