issue_471
Merge pull request #555 from jac1013/issue_471

#555: pull request issue_471