merge pull request #125