Merge pull request #364