Merge pull request #387 from github/izuzak-patch-1