Included Python3 changes from Dustin Oprea

From #38.