Incorporate pull request 614