merge pull request #60