Feature/2.2

Porting to a python2/3 codebase.