issue #230
Merge pull request #428 from jac1013/issue_230

#428: pull request issue #230