adding six and fixes for py2 and py3 compatability