Python 2/3 changes.
Merge pull request #19 from vinnyrose/python3

Python 2/3 changes.