add python 2 support
Merge branch 'python-2+3'