Added better support for Ubuntu