Added support for auto-starting server