Fixed python 2.7 after accidently breaking it
One more block to go I hope :P
Now works with python 3