Pull request for issue #3