Merge pull request #20