initial python 3 support, not final
Merge branch 'origin/master'