Updated to support Ubuntu Lucid