commits from ubuntu and new algorithms