Minor updated based on comments on PR 277.