Fixed
Merge pull request #2 from B0bby/master

If I fuck up again, I quit.
Merge branch 'master' into python3