Version with some bug fixes added after Debian tests.