Closes #7

There seem to be no more python2 idioms in the code.