Fixed py2 support
Added better py3 support
Merge pull request #20 from sontek/py2_support

Better Py2/Py3 Support