merge for pull request #592