Final changes for #50.