updated for Python 3.4