Support further options (Thanks to Sven Eden). Add systemd support