python3 compatibility change
Merge branch 'dbykov-master'