Added option to connect automatically