python 3 compatibility changes
Merge pull request #1 from tonyroberts/master

python 3 compatibility changes