works in 2.6 again, minor cleanup, to version 0.1.20