python 3 support enhanced
Merge remote-tracking branch 'origin/master'