Add changes for v0.31. Closes #20.