Added support for 12.04