Adding support for Ubuntu/Debian distros (revised)