More py3 like.
python 2 and 3 working version
Merge branch 'py3'