Added the possibility to choose from running as server or client