merging in pull request 60 from the parent