merge pull request #29