Merge pull request #5