Added --no-tty option