speedups for python 2
Merge branch 'master' of github.com:ztane/Tonnikala