Added command-line support
Added port selection