Merge pull request #10