updated pull request for issue #16