pull request for completed issue #52