Merge pull request #370 from plq/master

python3 fixes
Merge remote-tracking branch 'arskom/master'