Updates based on comments on #100.