Updated code to Python 3.3