Merge pull request #498 from xsdg/c99