Updated to work with python 2.4 (Hopefully ;-))