Added option to change port number