Updated for Python 3.4