Added 10.04 support