merge pull request #10