pull request for issue #26