Python 3 compatability fixes
Merge pull request #36 from pydanny/master

Python 3 compatability fixes