Changes based on feedback of pull request #251