Merge pull request manually #362