add python3 support
Merge branch 'develop'