Updated branch from launchpad