Python3 Compatibility

This also adds #7