Included pull request #53 logic.