Updated for Python 3.3.0