Merge pull request #1556 from Benglin/master

Addressed review feedback of pull request 1544