Merge pull request #549 from enmaku/master