Added updates from tpypp

I also added python 3 support. I'm glad I'm submitting pull requests to myself :D