Issue 110 py3

A few changes for Py2/3