merge jcassee #5 + Python 2.4 compliant extra patch

merge #5 + Python 2.4 compliant extra patch