pull request for issue #20