Python 3 compatibility
Merge pull request #444 from mpharrigan/py34

Python 3 compatibility