Initial pull from launchpad 0.2.4