ADDED: support of Python 2.5+