Merge pull request #1 from typecho/master

Sync with original repo