add condition for py2 and py3
Merge branch 'develop-support-python2'