Sync to Darold's master cgi
Merge pull request #11 from Tatsuya-Nonogaki/patch-10

Sync to Darold's master cgi