merge pull request #66