Merge pull request #432 from mirage/master

fix cgi