Initial import of 1.0 from February 2007