pull request for issue #2